auto merge of #600 : alexcrichton/cargo/update-ssl, r=brson
authorbors <bors@rust-lang.org>
Fri, 19 Sep 2014 00:58:38 +0000 (00:58 +0000)
committerbors <bors@rust-lang.org>
Fri, 19 Sep 2014 00:58:38 +0000 (00:58 +0000)
This *should* help with #598, but I'd like to confirm that it's fixed with a
snapshot before marking it as fixed.

1  2 
Cargo.lock

diff --cc Cargo.lock
Simple merge